Hi,

now the pull-request contains also a bugfix proposal, which make the tests go trough.
Please take a look at is asap, thanks.