RC4 changes.
Merge pull request #85 from dragos/release/4.0-rc4

RC4 changes.