Revert "Merge Conflict"
Merge pull request #475 from ZomgPonies/revert-474-master

Revert "Merge Conflict"
Merge pull request #35 from ZomgPonies/master

Merge from Master