Fix bug and release version 1.0