improved logging
Merge pull request #201 from brucehoff/develop

improved logging