Removed _wrapper (issue #11)