Code cleanup
Merge branch 'origin/Master-both' of github.com:JFrei86/HWserver into origin/Master-both