Dev to Master

Merge of recent development work into master