everything seems to be working now
Merge pull request #28 from alisonelizabeth/working-branch

everything seems to be working now