Merge pull request #1 from tlbdk/master

Please merge my folder changes
Merge pull request #3 from JarlTuxen/master

Merge pull request #1 from tlbdk/master