Merge pull request #1 from upisfree/master

Little style changes
- compatibility with version 2.3
Auto recreate menu items if its deleted
Merge pull request #1 from NC22/master

Merge commits from original repo