Fix include
Add functions to support
Merge pull request D7EAD#34 from D7EAD/v3.2.0-dev v3.2.0 Update
Merge pull request D7EAD#33 from D7EAD/v3.1.1-hotfix v3.1.1 Hotfix