code cleanup
Merge branch 'master' of https://github.com/QFrameTK/TME
refactor during code cleanup
Merge branch 'master' of https://github.com/QFrameTK/TME