Merge pull request #14 from fabrixxm/master