bug fixed
bugs solved
Merge branch '0.9' into laura