Merge branch 'hotfix/arsenal' into develop
Merge tag 'fix-readme' into develop

readme
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Updated ffmpeg to v2.4
Updated README
Merge branch 'release/v0.3.1'