219 fixes (Eclipse info).
Merge pull request #20 from gamerforEA/master

219 fixes (Eclipse info).