fixed #94 + test case (now in master)
Merge remote-tracking branch 'origin'