Version 0.2 with bug fixes and enhancements