OCSADV-154 restored overwritten changes from #51(REL-2015)

This restores @fnussber changes in #51 which were inadvertently overwritten by #124. 

Sorry about that ... always need to `test:compile` at the top.