Refactoring code, releasing 0.2