OCS 0.7.1
Merge pull request #193 from gsegura/develop

OCS 0.7.1