Merge pull request #12 from ax3ghazy/new_wrapper

New wrapper