cleanup and update to 4.2.0
Merge pull request #12 from mizzao/master

cleanup and update to 4.2.0