First bool options added and fixed bug with parsing