Merge pull request #555 from mvala/master

Ignoring eclipse setting