Add whitespace handling
Release v1.2.0