Refactored last merge and updated version number.
Updated package version.