Merge fix
Updated to dev version number