Refactored code
Merge commit 'd719632'