Merge pull request #119 from sintefmath/jnygaard_smallFix

- Small fix in png-encoder
Merge remote-tracking branch 'origin/master' into jnygaard_twoCanvasTest_cleanup