Merge pull request #2 from realtinymonster/master

merge
Merge pull request #3 from realtinymonster/master

merge
Merge pull request #10 from HeroOfTheWinds/master

Merge pull request #2 from realtinymonster/master