Refactor af5309a2d20c14de13b5a26c68bacd6585b7be64
0.2.1 released