Updates
Merge https://github.com/cryanperkins/PublicCode