merge

align to version 1.0.3