We report on the development of a 2 MHz non collinear optical parametric amplifier (NOPA) for high repetition rate time resolved X-ray or optical spectroscopy. Our modular and very flexible device is pumped by the second and third harmonics of a commercial femtosecond Ytterbium-doped fiber laser. The amplified pulses are tunable from 520 nm to 1000 nm with pulse durations between 15 and 30 fs over the full tuning range. The same setup is also suitable for broadband amplification and we demonstrate the generation of 6 fs pulses at a central wavelength of 850 nm as well as the generation of a broadband spectrum supporting 4.2 fs transform limited pulse duration at a central wavelength of 570 nm. Very high stability and compactness is achieved thanks to an optimized mechanical design.