initial logger
merge branches
logger and modified timestamp to support function needed by logger