fixing formatting to make jazzy happy
Merge branch 'pr/21'