Simplified dependencies and build process
Merge branch 'master' into gh-pages