Merge Development Branch

The development branch is now stable and is passing preliminary testing.