lcgraham Merge pull request #9 from lcgraham/master