try to control modal
Merge branch 'master' of https://github.com/capellayee/roo
Merge branch 'master' of https://github.com/capellayee/roo