* Extended protocol parsing
 * Removed warnings