Issue: #161 July - August - 2012