Refactorate
Merge branch 'master' of github.com:refiito/osp_ui