Issue: #148 May - June - 2010