Issue #136 fixed
Fixing issue #41
whitespace
Fixing issue #141