Add a toggle option, wrap
Merge branch 'master' into mac