Cleaned up logging
Merge pull request #5 from stanleygu/master

Cleaned up logging