cehoffman Merge pull request #6 from rcoedo/master