Support for new Matroska elements

Contains fixes for issues #4 and #5