Merge pull request #8 from emrickgarrett/master

sdf
Merge pull request #27 from caitlinvangundy/master

Merge pull request #8 from emrickgarrett/master