Issue: #147 March - April - 2010