Update Logging logic

Updated for issue#33,