Changes discussed over IRC
Merge pull request #1 from marcoscaceres/patch-1

Changes discussed over IRC