Updating Master to new release
Edits to version.hpp