voidberg Merge pull request #45 from hajs/master