Implemented Menu Class
Merge origin/master