Merge pull request #51 from taschetto/feature-add-menus

Fix #50.
Merge pull request #53 from taschetto/master

Fix #52.
Merge pull request #2 from fator7/master

Merge com fator7/master.