Support for installation in folders.
Merge branch 'develop'
README.