atilaneves Merge branch 'fix-77'

Latest commit bc5eed1

Aug 23, 2018