Merge pull request #2 from shuwnyuantee/master

jstock.org pages
Merge remote-tracking branch 'upstream/master'