Updated media capture
Merge branch 'master' of github.com:samdutton/simpl