merge #370 into 0.8.2