egonw Merge pull request #5 from chrras/master