Adjusted to my versions, added eclipse plugin