Added ability to merge options
Added extra assertion
Merge pull request #24 from AxaliaN/master

Added ability to merge options