Final PP-6
Merge pull request #3 from tiagokrebs/PP-6

Final PP-6