Fix#111

I fixed again the #111, old pull request #112.

Here it says it is able to automatically merge.

I merge my local master to this branch and everything worked out.

Sorry for the very long delay.