commit breeze reverted. I need to solve some bugs
Merge pull request #440 from Diullei/master

commit breeze reverted. I need to solve some bugs