Misc updates
Merge pull request #2 from robhudson/misc

Misc updates