Merge pull request #46 from krofna