Modifications on Course Update.
Merge origin/master