Speed up the build step
Correct the order of sosome dependency and config options to fix build
Merge branch 'master' into gh-pages
Build