Integrating

1) merged my code with upstream
2) altered code so player works after merge