Updated version numbers
Resolved version number conflicts