Refactored 4889648
Layout changes for multiline (closes #16)
Bump version to 2.0.0.3, bump changelog