Fix up style
Merge pull request #168 from sammuel86/dev-0.3

Fix up style