Merge pull request #46 from p1tz/master

merge
formatting, redo help overlay