Fixup
Merge branch 'development' of github.com:Basuco/Paradigm_Shift into development