Merge pull request #3 from MauriceMohlek/master

Merge