New/chris

Merging into master branch.