Random
Merge pull request #6 from nathanielmendoza/master

Random stuff