merge
added http substitution