seems to have fixed wrap issue for Jeff
Merge branch 'no_wrap_bug' into devel