Development

Merge the current state of development code into the master branch.