Merge pull request #9 from darung/master

This is not a merge
i am ready to commit
long ago, in a distant past
Merge pull request #16 from ancagrosan/master

yet another merge