Issue: #156 September - October - 2011