Merge pull request #25 from Sjord/version0.21

Up version number to 0.21

Merge pull request #14 from Sjord/v0.20

Version 0.20