updated and subdir
Merge branch 'release-0.1.1'