Improved PNG import.
Improve readability of previous commit
Merge pull request #2 from CruzR/png_import

Improved PNG import