Fixes #10 - Added combo support for built-in server