Merge pull request #10 from stjantti/master

Suvi-branchin päivitys masterista
Merge pull request #13 from stjantti/Suvi

Merge pull request #10 from stjantti/master