Update to 4.0.4

Removed >>><<< head and other junk
Merge pull request #199 from Mexahoid/patch-5

Update to 4.0.4