Rectified errors
Merged