Merge pull request #37 from stjantti/master2

Master2