Updated to work with Eclipse and Git