Merge pull request #9 from tomasbjerre/master

Some basic infrastructure
Merge remote-tracking branch 'upstream/master'