Add support for custom option defaults
Fix custom option defaults not merging correctly
Merge pull request #122 from artnez/master

Add support for custom option defaults