Add new version numbers
merge with rvirding's develop branch