Merge pull request #17 from ckelman/charlie

Charlie