Merge pull request #90 from fabrixxm/master