refactoring for customization
refactoring for customization
Merge branch '11'