Issue  #65 #125 #126