This is from Raelyn
Merge pull request #6 from stockwellaz/master

This is from Raelyn