Fix for Bug 26927
Fix for bug 26927
Resolved merge conflict
Update new reference to add/removetrack to use <code>
Merge pull request #39 from boblund/bug26927

Fix for Bug 26927