Update to 4.0
Merge pull request #11 from infosiftr/update

Update to 4.0