a little refactored
Merge branch 'core_topic2' of https://github.com/k-motoyan/next into core_topic2