Issue #959 #960

Closed thiagobustamante closed 8 years ago