Merge pull request #197 from ThePyrotechnic/Dev

Fixed head error
Merge pull request #198 from ThePyrotechnic/Dev

Dev
Merge pull request #199 from ThePyrotechnic/Dev

Commit message:
It's been 4 hours...