Merge pull request #42 from ybilik/master

Options request and test request added