final version GSoC 14