Preserve viewport units
Merge pull request #303 from itrelease/master

Preserve viewport units