Fixes and improvements

[mghesh-yseop]

Hi,

Please find here some improvements added to this, very good, library.

In order to use it efficiently and correctly, I had to integrate these updates.

I cherry-picked (to give credit to @mrrsm) the commit added in this PR.

I hope this can be merged, so I can switch to the real release, instead of my own repo.