Fixed a bug with using two arguments instead of a configuration object
Updated version
Resolved merge conflict