fixed name bugs. (again -.-)
Merge pull request #54 from IagoLast/master

fixed name bugs. (again -.-)