some fixes in version 1.0