Added course conversion functions, half of them at least.
Merge remote-tracking branch 'origin/master'