uurha Merge pull request #28 from uurha/dev