Adds logging.
Merge branch 'master' of github.com:nickschuch/marco