Update to latest master and change version