bug fixes and minor code changes - Release 0.2.3