* Added option --enable-logging to enable diagnostic logging * Addressing feedback * Addressing feedback, round 2