schollz Merge pull request #3 from schollz/3