Initial Commit from eclipse issue