closes issue #146 and refactoring updates
Merge branch 'feature-csf-exceptionlogfix'
closes issue #146 and refactoring updates