Removing trailing whitespace
Merge branch 'master' into specs
Merge pull request #50 from rhokbrisbane/specs

Specs