Merge development to master

Course function is nearly complete.