Issues/25

please re-review  #25