working on #3 flexible check folder name
fixes #3 (flexible check folder name)
Merge branch 'feature/3-flexible-check-folder-name' into dev