Merge pull request #7 from darung/master

This is not a merge
Merge pull request #8 from darung/master

This is not a merge
I do not remember this ever happening, but still, I will commit it, hoping it's for the best
this file changes everything
Merge pull request #13 from ancagrosan/master

yet another merge