refactoring scope name
solve conflict
Merge pull request #33 from tikkss/top

refactoring top controller