Update to version 0.21
Merge pull request #2 from jkent/master

Update to version 0.21