kap 7
Merge pull request #15 from miili/marius_edits

kap 7