Merge pull request #4 from wking/master