Merge pull request #89 from ns-uw/master

1.03; the final merge, I believe, truly.