Merge pull request #52 from MauriceMohlek/master

merge