Refactored and commented
Merge branch 'master' of https://github.com/D6Digital/SWENGFrame.git