update. New version

Fixed bugs