Issue: #139 November - December - 2008