Exception Handling
Exception Handling
Exception Handling
Merge remote-tracking branch 'origin/master'
Adding logging support