Retina support
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from codeanticode/master

Retina support