#118 Replace Option by Maybe