merge 0.8.1 into 0.9.0