Merge pull request #5 from beregond/test

Mwahahahah.
Pyrypyry.