The code was refactored for 'pull request'
Merge branch 'refactor-master' into new-module-news