Close #82 - reimplement whitespace filter