commented out raw values to account for memory issue until release is updated
Merge branch 'master' of https://github.com/CNMAT/OSC