Refactored last merge, updated version number, updated tests.