Fix major bug
Change composer
Merge branch '1.0'