Issue #476 fixing spaces and tabs