first merge from eclipse project