Address issue #39, added new sloppymapping option
Merge branch 'sloppymapping' into develop