fucking logger added
log fixed
Merge branch 'master' into logger

inevitability