Merge pull request #309 from hulkholden/hidpi