updated version to 4.0
after merging with master