Polished the turd - added comments for future code maintenance
Merge branch 'master' into GUI