Debug logging
Improve/Extends #140
t push origin masterMerge branch 'Artur--master'