fix

fix
Correction #5

general corrections
Branch updated with master
Merge pull request #20 from RasmusBlind/Emil's---corrections

Emil's   corrections