Merge remote-tracking branch 'thiagofm/master' into pt-br
closes #1