fixes for 0.8
0.3.0
0.8