Copied files from the old repo
Merge pull request #1 from Zabot/master

Copied files from the old repo