minor
Merge branch 'dev' of https://github.com/NCPP/ocgis into dev