Merge pull request #1 from neskola/master

pull this
Testausta 2

Jee, jee.
Merge pull request #2 from Jari-Ra/master

Testausta 2