Merge pull request #18 from nathggns/version-0.2.1

Version 0.2.1
Merge current master