Niall Gallagher - 2011-04-28

I will take a look at this. Thanks for feedback.