Minor improvements
0.2.8