... and the missing files
Merge pull request #13 from meriko/master

... and the missing files