Improved architecture
Merge branch 'master' of https://github.com/sandb/getopinionated.git