adding pre wrapping - as 'default' option #39
Merge branch 'pre-tag-wrap' into dev