Merge pull request #131 from gabriele-v/master

Fix menu crash on Mac
more nice formating with <dev> tag
Merge pull request #132 from vomikan/master

more nice formating with <dev> tag