Merge pull request #104 from stjantti/master

Pivitän muutoksia itselleni
Orava bossia
Merge pull request #106 from stjantti/DanielBranch

Daniel branch