Fix version number

This PR undo #325 and update the version number to current branch version