Merge pull request #1 from ganymedes02/master

Mergey, Merge, Merge