Merge pull request #1 from july4th/master

Merge from master
Merge pull request #2 from july4th/Proto

Proto