Merge pull request #2 from sindanar/master

merge