Updates prototype code to the latest development done during WK hackfest 2013