Stuff
Merge pull request #6 from yngvebn/Part5

Stuff