Assorted changes
Merge pull request #55 from jetty840/dcnewman-merge

Assorted changes