fix some bugs
Merge branch 'master' of https://github.com/BreezeCSA/Breeze

Conflicts:
	README.md