Refactoring code
Merge branch 'master' of https://github.com/wistcc/bcsti-domino-test