GSoC'14 work, among other things..