Merge pull request #222 from dhardy/0.3

0.3.20 release