Cleanup
Further cleanup
Handle errors more gracefully
Release v0.2.6