edie:jpg instead of png
Merge branch 'master' of https://github.com/jaromrax/shspe
I am not sure where from is this merge......