Issue: #159 March - April - 2012