Wrapped code
Merge pull request #1 from bliker/master

Wrapped code