Needs a bit of fine tuning
Merge branch 'master' of https://github.com/nighthawk702/Infoarena-Solutions