fixed some problem
Merge branch 'master' of https://github.com/Esysteme/glial-new