implemented the remaining shims
Merge pull request #2 from rolandzwaga/develop

implemented the remaining shims