Issue #964 #978

Closed thiagobustamante closed 8 years ago