Fixed incomplete merge in menu. #14
Fixing incomplete merge. #14
Fixed incomplete ass merge. #14
Merge branch 'iss14' into development