Updated Hercules

Sync with Hercules Master