Merge pull request #9 from rwz/patch-1