fixed code
for merge
merged master