Merge pull request #2 from ganymedes02/master

More Merging