daniel: stocos cleanup
Merge branch 'master' of https://github.com/j45ch/icst_cmj_mapping