Changed syntax for calling methods
Fixed overriding options by reference to merge original and create a new hash