Nuku/Flexible-Survival — pull request #740 by TigerStripes (2013-04-30 10:45:31+00:00)
Title: Correcting Fixes

Repairing and adjusting some of the changes made.