Merge updated root/master branch

Merging updates from Eric's master branch into a new testing branch. Hopefully I've set this up going in the right direction.