Code Refactoring
Merge branch 'configurator' of https://github.com/blackhydrogen/noop-sewi into configurator
Minor Code Change