cfdrake Merge pull request #3 from echophon/master