fixed OSX issue, removed old Regex dependency