(#25) removed underscore, fixed options usage