Merge pull request #155 from jjliang/master

quick merge
Merge branch 'master' into umass_branch
fixed page numbers and added actions
Merge branch 'umass_branch'