fogleman Merge pull request #77 from larryng/master