Fixed a bug
Added options