Merge pull request #3 from emmanuel-keller/master

Merging, but I really don"t like the search method
Merge remote-tracking branch 'upstream/master'
Add eclipse and mac files to ignore