Further works
Update to version 0.0.9