Some fix

fix #25 
fix return error on success