Merge pull request #37 from stjantti/master2

Master2
Merge pull request #38 from stjantti/master

Merge pull request #37 from stjantti/master2