Added xvfb support