Just a few fin(n)ishing touches

Sorry, couldn't resist the pun.
Merge pull request #13 from kallekilponen/patch-4

Just a few fin(n)ishing touches