Merge pull request #1 from sindanar/master

pull request