This version works
Merge branch 'master' of https://github.com/vladysimo/osss-web