merge 0.3.1