Development update

Updating development branch. Out-of-sync with master.