Merge pull request #4 from syl20bnr/master