Issue #981 #983

Closed thiagobustamante closed 8 years ago