Make it easier to require
Merge branch 'hotfix/easy_require'