Issue: #140 January - February - 2009