Guy to refactoring.
Merge branch 'master' of https://github.com/justaway-factory/justaway