update to 3.21
Merge pull request #9 from jochenberger/master

Update to 3.21