Hopefully fixed this issue once and for all.
Merge branch 'master' of https://github.com/VajraFramework/Vajra
Merge branch 'master' of https://github.com/VajraFramework/Vajra