rules update
replay bug fixed
Merge pull request #17 from simonmysun/master

merge into gh-pages