fixed macro expansion
changed macro syntax to %{} instead of $()
Merge branch 'master' into http-client-ih