Some basic infrastructure
Merge pull request #9 from tomasbjerre/master

Some basic infrastructure