Fixes issue:#130