added logger
merged with develop