proxy
journal domain
meterial design
Merge pull request #131 from hmert/master

merge