Merge pull request #47 from MauriceMohlek/master

fixes #46