Added folder option
Merge branch 'master' of https://github.com/Eniro/put