Updating version
Merged in changes
Fixed update bug