use menubar instead
fix man installation
fetch from upstream
Merge pull request #31 from Brli/master