Version to 4.0

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
fixing awkward phrasing
Merge pull request #320 from nwwells/patch-1

fixing awkward phrasing
Merge remote-tracking branch 'upstream/master' into email