Implemented test for Options
Merge branch 'release/0.1.1'