Merged in feature/rename_update (pull request #2)