Made changes to include Eclipse compatability