Merge pull request #38 from katiewood/master

clean up