Merge remote-tracking branch 'Pantastic/master' into Pantastic-proto

* Pantastic/master:
Merge pull request #1 from ilyfa/proto

Merge remote-tracking branch 'Pantastic/master' into Pantastic-proto