issue#33 and issue#34

pay atetion, the database was changed