Fixed #621 (removed tabs and trailing spaces)