Merge pull request #5 from Jari-Ra/master

merge