fix #16
Merge branch 'master' of http://github.com/JFrei86/HWserver into validator