Fixes and enhancements - 0.2.6