fluffy goodness
Merge pull request #7 from mlsteeves/master

fluffy goodness