closes #119 added Wrapper to definitions
Merge branch 'issue119'