#1 fix about null argument
#1 merge stable-devel and conflict solved