Merge pull request #7 from martinhath/master

Merge til faktisk repo
Merge remote-tracking branch 'upstream/master'