Merge master with logging
+ Add src/logging.h