closes #40
minor format change
Merge branch 'master' into labels