Updates more
Merge branch 'master' of https://github.com/horsetailfiddlehead/ee478