Fixes # 176 With dmfrey's last comment & commenting out of Log messages