Basic rename support
Fixed main menu item
Merge pull request #36 from gwilliams/master

Basic rename support