Merge pull request #4 from TheTifster/master

Merge pull request #2 from Skwidensky/master
Merge pull request #3 from Skwidensky/master

Merge pull request #4 from TheTifster/master