Merge pull request #4 from Earisu/master

Attempt to Merge Earisu's Hercules
Fixing Travis/GCC/clang error

Signed-off-by: shennetsind <ind@henn.et>
Merge pull request #1 from shennetsind/master

Fixing the error