Polish solution and fix a few typos
Merge pull request #5 from snicoll/polishing

Polish solution and fix a few typos