Added new option collapse_whitespace

Also bumped up the version.