Fixed Media constructor
Merge branch 'master' of https://github.com/felixgirault/essence