Initial commit
Updated logging messages
merge commit