update to 4.0 Version
Merge pull request #2 from osltc/4.0-branch

update to 4.0 Version