merging testing into master

I'm merging the 'testing' branch into the 'master' branch because I want to be able to pull the newest version (testing) immediately