Nuku/Flexible-Survival — pull request #298 by TigerStripes (2012-06-12 14:56:45+00:00)
Title: Elijah fix 3

More fixes