Pull request 

Hello,

I changed some things. Please take a look ;-)

Thank you