Enhanced logging
Improve Debugging
Merge remote-tracking branch 'origin/master'