Merge pull request #46 from leonsenft/add-@viewport

Adds support for @viewport