Various improvements
0.2.1
0.2.2