Updated version number
Merge fix