Merge pull request #350 from sergeyklay/master

Post image fixes