Develop

Update to 0.5.0