bugfix
Merge pull request #2 from gtanczyk/master

merge