Code commented
Merge fix