Minor changes (comments, demo layout fixes)
Merge remote-tracking branch 'origin/master'