Made Roar and Whirlwind never miss
Merge pull request #651 from ScottTM17/patch-2

Made Roar and Whirlwind never miss