Initial fix for whitespace handling. Issue #88.