Tamarou/Crixa — pull request #3 by autarch (2014-10-01 21:58:46+00:00)
Title: Many many updates

This fixes issue #2, among other things.