Merge pull request #765 from zeroadam/CoreLogger