Covered points mentioned in #32, kindly review a new patch.