Issue #979 #980

Closed thiagobustamante closed 8 years ago