fixes #48
Merge pull request #52 from despo/fixes-48

fixes #48