Merge branch 'codebase-refactoring'
Merge branch 'master' of https://github.com/wayfare/Sweeper