GSoC 2014: updates

Signed-off-by: Eduardo Silva <edsiper@gmail.com>