GSOC 2013

@wluyima and @ishara-p how you feel about integrating the gsoc2013 branch?