Performance improvement
Merge remote-tracking branch 'origin/1.0' into 1.0
Bugfix: category update
Bugfix: page update
Merge pull request #7 from tagbangers/1.0

1.0