Merge pull request #1480 from deepak-srivastava/logs