Final commit ot GSoC2013