bug fixes
some commit
Merge branch 'master' of https://github.com/vanbelle/c291_gp2