Merge pull request #23 from RasmusBlind/Emil-Corrections

Corrections #5
LAL
Merge remote-tracking branch 'origin/master' into Emil-Corrections