add namspace, use resource instead of http
Merge origin/master
Merge origin/master