merge from cavedude/server