finished version 0.2; starting new version with additional fixes