Refactor
Reduce to one line
Merge pull request #1 from roofimon/master

Refactor