Added options (issue #32)