fixed issue 364
add one page example
fix issue 368
fix issue 368
Merge remote-tracking branch 'upstream/master' into develop