Batch commit. Horrible, just horrible.
Merge pull request #4 from TheAntiEgo/master

Batch commit. Horrible, just horrible.