Merge pull request #141 from mumuqz/chaos_calmer