Upped version and style changes

Upped the version, removed trailing whitespace and replaced tab with
spaces.
Merge pull request #3 from abooitt/improvements

Upped version and style changes