Merge pull request #9 from telly/master

Duplicate files issue