Merge pull request #17 from ssabpisa/master

Weekly updates
Merge branch 'master' of https://github.com/OADA/oada-test