Merge pull request #3 from larste/master

Pakke struktur, yes sir
Merge remote-tracking branch 'upstream/master'
Made some stuff