0.6.1 fix for require
Merge branch 'hotfix/0.6.1'