felipemanga Merge pull request #121 from Torbuntu/patch-3