Merge pull request #30 from KirinDave/master

Fixes
Cutting 2.5.1. Stability fixes at high severity.