Fix for issue #52 and #59
Minor fix related to county and update to issue #59