Work related to GSoC 2013