Merge pull request #30 from kesl/proto2

First release of Prototype 2