fixed bugs for release version 1.0