upgrade to 4.2.0
Merge pull request #16 from benmgreene/4.2.0

Upgrade to 4.2.0