Merge pull request #1 from codecop/master

Infrastructure finished