Merge pull request #1 from keisto/master

1pull
Merge branch 'master' into pages