Issue: #141 March - April - 2009