Adding filter, some auto whitespace trim

For issue #41