Merge pull request #1 from robinbattle/master

Changes
Merge pull request #20 from adam000034/master

Changes