wip'
Merge branch 'master' of github.com:accidia/protostore
wip