Issue: #152 January - February - 2011