Issue #95 removed spaces