Issue #131 - fixing spaces