Add wrap feature
Merge branch 'features/wrap'
Adding enable/disable feature