Version submitted to MSR 2013

Also, last review round form @aivaloglou