merged master in and bumped the version to the correct value