Merge pull request #1 from Skwidensky/master

Merge
Merge pull request #3 from TheTifster/master

Merge pull request #1 from Skwidensky/master