Arza changes from fork
Merge pull request #1 from Arzaroth/master

Arza changes from fork