updated
deleted, fixed #32