Merge pull request #10 from danielfoord/dev

bla :)