Merge Development into master

First round of updates from Jacob