Merge pull request #26 from mdt0093/master

Update branch with latest from master
Display menu's and menu items
Merge pull request #31 from mdt0093/table

Table merged into master.