apply pr 494 and 496
Merge pull request #3 from Shopify/apply_494_and_496

apply pr 494 and 496