high dpi (retina/etc) support, mild refactoring
Merge pull request #1 from bwiklund/master

high dpi (retina/etc) support, mild refactoring