1.5 Version Bug fix Issue #4 and Improvements on Code
Automatic name generated only on Add new mode
Merge branch 'dev'