Correct some bug, add options, v1.7.0