Resolved merge conflict, added numpy functions