fixes during first testing
Merge branch 'master' of github.com:delving/oscr-data