Merged with GSoC_2013