master : first commit by Praveen Sah
fixed merge conflicts