Patch 1

Had some problems with GitHub, because I am new to it, thats why I needed so many changes before pulling the request, I hope this time you are satisfied with the changes. I tested both of the Methods and both work in  my project.