Probable JIP Fix
Merge branch 'master' of https://github.com/Phantomsmedia/Phramework