Code Changes made as per feedback from Andrew Kofink - 6th November, 2013
Code Changes made as per feedback from Andrew Kofink - 6th November, 2013