Several Bug fixed
Merge branch 'master' of https://github.com/Marine-22/BOC