Minor enhancements and bug fixes (v0.2.1.2)