Merge pull request #22 from nolanfilter/Nolan

Generalized Fear and Sanity changes