Merging the current dev branch in order to do a cleanup of the repo.