Update version info
Merge in version fix