Fixed possible bugs
Improved rename method
Merge branch 'develop'