Merge pull request #27 from ckelman/charlie

Charlie