fixes #50
fixes #51
Merge pull request #52 from MauriceMohlek/master

merge