Merge pull request #886 from pyr/feature/write_log