Merge pull request #643 from pveentjer/0.5.0-rc.1

0.5.0 rc.1