Update for beta 4
Merge branch 'develop'