Merge pull request #819 from emmanuel-keller/1.5

Add meta file for eclipse m2e
Merge pull request #821 from emmanuel-keller/1.5

Bug fix