add some logging output
small cleanup
Merge branch 'release/0.1.26'