project modification
Merge branch '0.2.5-dev' of https://github.com/cobaltians/cobalt into 0.2.5-dev