Added a filter for each track. Added some doc.
Merge branch 'master' into gh-pages