Merge pull request #27 from aspiers/master

more misc enhancements