Develop

Update to 0.2.0