Issue: #153 March - April - 2011