Merge diff from felipetraj to fix issue #71