implement something
Merge branch 'qr-2013-c' into develop