Added logging
Merge remote-tracking branch 'origin/master'
Added logging (issue #3)