--- Put the 'static' keyword back ---
Merge branch 'master' of https://github.com/ProfBest/ITMS.git