Port chriswailes changes (#10)