Refactored code
Merge commit 'e61cc9d'