Made it Eclipse independent