Peter Gottesman

I will take a look at this patch when I get a chance.

@pellettiero, sorry I completely forgot about this. I will look at the patch tonight/this weekend. I am not sure about @neeasade's opinion on it when it comes to minimalism, but...