Dev

Moving the current development version into master branch.