Bug Fixes
Merge branch 'version5.0' of github.com:ChioriGreene/Chiori-Framework into version5.0