Merge pull request #178 from jpmontez/logging

Logging