Fix #9 #10 . Plus the constructor has been changed.