Merge pull request #2 from floatingboxes/master

Merge master/pages