Workaround new Eclipse plugin and some other improvements
Merge pull request #28 from bhatfield/master

Workaround new Eclipse plugin and some other improvements