Merged changes from development
Upped the gem version number.