correcting paths
Various code improvements
Merge branch 'master' into gh-pages
generating css file