Bumping to 0.5.0
Merge branch '0.5.0-branch'