updated the options and fix #12