winston Merge pull request #60 from elifoster/master