Merge pull request #419 from arstrube/eclipse

Eclipse