NEW: marker bookmarks can now be reached from the menu.
Merge branch 'master' of github.com:martflu/amanaman