Merge branch 'master' into gh-pages
Geo II updated to support lines
Merge branch 'gh-pages'