Fixed compiling errors
Merge branch 'master' of https://github.com/MercuryGroup/BISystem