working on version 0.2.0