code cleaning
Merge branch '0.2.6-dev' of https://github.com/cobaltians/cobalt into 0.2.6-dev