[Enhancement] Adding shim support fixes #4
Merge branch 'master' into computed