Merge pull request #5 from r0e/master