merge from 1.0.4