Merge pull request #1 from jkent/master

Update to version 0.20
Update to version 0.21