Fixes #16. Also fixes a major bug in the 1.2 release.