Merge pull request #5 from fabrixxm/master