2013-05-24: feedback improvements
Merge branch 'kreincke'