Added options
fixed commit error