added a test
added Option-like methods