Merge pull request #4 from jeremyroman/master