Merge pull request #1 from jojona/master

LGTM
HejJohanCommitTEST
fdk
Ny
e till ä