Initial works on  #36.