pulling kathy's changes
Merge branch 'master' of https://github.com/jakers/Hermes
pulling kathy stuff
Merge branch 'master' of https://github.com/jakers/Hermes