Further polishing
0.0.8-SNAPSHOT