updated menuItems
added macros and setupMethods
Merge remote-tracking branch 'origin/master'