Update version
Code improvements