Issue: #160 May - June - 2012