Updating the dev branch to version 1.6