naive extra files bits
Merge pull request #18 from cartazio/master

naive extra-files bits