Fix #1

Hi, 

I think I could have fixed the issue I opened lately, (#1). All tests pass: let me know if I can help!

If it's ok with it, I (you have to ;) ) would update it on CRAN...

Ciao!
Giuseppe