Merge branch 'master' of https://github.com/HerculesWS/Hercules