write code allow requirement
Merge origin/master