Update for to_str->to_string and macro hygiene changes
Merge pull request #189 from bjz/update

Update for to_str->to_string and macro hygiene changes