Merge pull request #42 from ns-uw/master

CSS only