Hypatia Pull 8/11/14

Brings up to date with Hypatia