main stayla #87
merge
Merge branch 'master' of github.com:hmert/ojs
fix #87