fixed strange bugs
Merge branch 'master' of github.com:Bagception/BagceptionMasterControlService