v0.5 beta integration

Integration of v0.5 beta into master branch.