Latest updates. Temp check-in for safe keeping.
Merge remote-tracking branch 'origin/master'