Merge pull request #16 from lloydmeta/refactor/embrace_options

Refactor/embrace options