Master

Pushing from a different computer. Large update merged from the dev branch.