Merge pull request #51 from p1tz/master

merge