Updated version number after merge