Merge pull request #2 from realtinymonster/master

merge