Merge pull request #264 from thess/mjpg-streamer