Changed version number for fixes (merges seem to cause two commits)