added logging
merge from master