Minor improvements
0.1.3