Update with changes from #3

See #3.