Fix #229 (Whitespaces removed