bug fixed
new feature added master
merged dev