Refactored code
Merge commit '6a1f4f9'