f1
merged feature1
modi master
after pull
#34 fixed
fixed #36