fixed resource: % => %%
Merge branch 'master' into beta