ehiggs Merge pull request #1 from ehiggs/master …