- Refactoring configuration
- Reviews and Ratings func
Merge origin/master