Merge pull request #46 from kenvandine/viewportOffsets

Fixed calculations for contentHeight and contentWidth