Issue: #149 July - August - 2010*