Merge pull request #3 from swetland/master

Some assorted tinkering.