Issue #981 #982

Closed thiagobustamante closed 8 years ago