Closes #2
Merge pull request #3 from TeamSparklePony/Issue#2

Closes #2