fix #5, #7, #8
0.5.0