Merge pull request #7 from reenigne/master

This might compile... I hope...
It compiles now. Doesn't work, but it compiles.
Merge pull request #21 from Alegend45/master

Merge Alegend45's latest changes