fixed merge issue
0.3.1