fix logger
Merge develop into master