Patch for PHP version > 5.4
removed passed by reference variables
removed passed by reference variables