Fixed bugs
Merge