hopefully fixed Emily
's bug and added new methods
Merge pull request #9 from CorbinFoucart/fixedEmilyStuff

hopefully fixed Emily