update to 4.2.0
Merge pull request #1 from jochenberger/master

update to 4.2.0