Fixed Issue #1
Logging added