Merge branch 'release/0.2.1'
Add 'modules' folder support