Last eclipse build fork merge issue 1

There was a merge conflict I couldn't resolve, so I branched changes from the main branch.