some fix and update to version 0.2