uurha Merge pull request #99 from uurha/dev