Changes to work with eclipse Luna and Kepler simultaneously.