Increase version number
Optimize code