Merge pull request #4 from stuken/master

Cleanup Eclipse project file classpath imports.
Merge pull request #1 from waratek/master

Merge pull request #4 from stuken/master