Merge pull request #158 from Shalzz/chaos_calmer