Merge pull request #414 from maz-1/mjpg-update