Pass at #129 (not working atm)
Merge pull request #1229 from anmonteiro/patch-2

Pass at #129 (not working atm)