Merge pull request #40 from jesseniemisto/master

staf