More fix attempts
Merge pull request #113 from katiewood/master

More fix attempts