Added Replayer Functionality
Merge origin/master