Merge pull request #1 from processing/master

Merge pull request #2 from processing/master