v1.0-20 : Fixes issue #25