Merge pull request #210 from jlec/png