Refactored last merge and updated version number.