Master 3
Merge pull request #3 from CasperWollesen/a58e555ebd5678a260797079a6660a9c0e6eeea0

Merge Master 3 into BranchTest1