bump to v0.4.0-beta2
merged with master