Merge pull request #1 from landroni/master

update to upstream trunk
Merge pull request #3 from landroni/gfilter-tweaks

Merge pull request #1 from landroni/master