Trim whitespace.
Merge pull request #50 from paulgibbs/whitespace-48

Trim whitespace.
Merge branch 'master' into beta