Fixed #19 - Can now deleteing and some other bugs