Update to latest

Misc updates
Merge pull request #1 from philrandal/master

Misc updates