Made code more efficient (not via a variable).
Merge branch 'master' of https://github.com/woosting/repo