Code reformat
Merge pull request #40 from paulrobinson/reformat

Code reformat