bugfix: search solution folder, not rootFolder
Merge branch 'develop'