bug fix master
feature2
merger
finished feature  2 code