Added exponental function
Resolved merge conflict