merge dev branch into master by Chris Mosetick