solve issue related commit
Merge branch 'master' of https://github.com/softweb/byot