Update 2.0 to 2.1

First edit is tested, not sure how to verify second.
Merge pull request #30 from lmeyerov/patch-2

Update 2.0 to 2.1