Minor improvements
0.1.7