rewrap
Merge branch 'master' into working
Fix #40 and #41
Merge branch 'working'