Feature - wrap option

Fixes #39