Add more logging.
Merge pull request #175 from eric-wu/develop

Add more logging.