fix error from previous commit
tweak style
Merge pull request #9 from matthew-chell/dev

Dev