Merge pull request #1 from ganymedes02/master

Pull ganymedes' changes (I have no idea what I'm doing right now)
Extremely minor change of a comment - first commit :3
Merge pull request #3 from chylex/master

What should I name this? Isn't the commit name enough?