Merged dev branch to master, mod to pull request.