Fix PR #42

Also removed trailing whitespace