Merge branch 'release/0.2.4' into develop
Added support for 'H264' and 'H 264' codec tags, fixed setup_path in unit tests
Bumped version to 0.2.5
Merge branch 'release/0.2.5'