Improvements for v0.1.1