Merge pull request #4 from gilbertwat/master

Infrastructure done