merge code
0.5.10 released