This branch is complete, which fixes #1