Patch 1

patching from Capture H8's Flag to Ferguson master