jcheng5 Merge pull request #12 from MarkAtwood/master