Fixes #50

Review: @keanulee