bugikorjausta
Merge branch 'master' into bugfixing