Finished Error Check but not tested yet
Merge branch 'master' of https://github.com/horsetailfiddlehead/ee478