Picture shown in Windows

It works in Windows (tested!), so it's your job to test it on mac.
Merge branch 'pr/26'