Update from upstream

Fixes #12