Fix Issue #1; tripping on whitespace after key-value pairs