Manual merge of changes from gh-76

Closes gh-76
Merge branch 'master' into ui-changes