Refactor
Merge pull request #8 from julio/plaintext

Refactor