Merge code from eclipse