korjattu testit
Merge remote-tracking branch 'upstream/devel'
Merge pull request #114 from nsikkila/master

testit