Fix output formatting error
Merged chris/issue-418 into master