Merge pull request #9 from jasonmit/master

[Enhancement] Adding shim support fixes #4
Resolving conflicts