Fix Issue #25, also remove spacing problem.