this is from eclipse
Merge pull request #3 from byronyi/newEclipseBranch

this is from eclipse