voldemort/voldemort — pull request #231 by clementfung (2014-12-12 23:18:48+00:00)
Title: Merging all my work

This branch now caught up with my local.