Folder switch
Merge pull request #18 from domestic/FolderFix

Folder switch