Merge pull request #2 from thonta/issue/1

[fixes #1] a
Merge pull request #3 from thonta/master

fixes #1