Merge pull request #2 from ganymedes02/master

More Merging
Merge pull request #4 from Vadis365/master

Merge pull request #2 from ganymedes02/master