Added m->f and f->m and updated menus
Merge pull request #6 from teamsimola/master

Added m->f and f->m and updated menus