Refactored code
Merge commit '84e557a'