those minor tweaks we spoke about
more edits
Merge pull request #11 from olliegill/master

fixing bugs