Minor changes ; demo project & css
Merge remote-tracking branch 'upstream/master'