added menu, not working yet
Merge branch 'master' into anton