Added support for @3x images. Fixed issue #118.
Merge branch 'master' into release-2.0