Merge pull request #2 from LegendaryAks/master

pull
Merge pull request #3 from psyhill/master

Merge pull request #2 from LegendaryAks/master