0.2.0: bug fixed
Merge branch 'master' of https://github.com/turingou/candy

Conflicts:
	Dockerfile